Fixed issues from merging.
Merge remote-tracking branch 'remotes/origin/master' into newgl