Merge "Error message when demo lib doesn't have main()" into devel/master