Merge "Add environment variable for multisampling" into devel/master