Merge remote-tracking branch 'tom/master' into dev
fixed reading pixels too fast
Merge remote-tracking branch 'jw/dev'
Fixed all GL leaks found by CodeXL. Shader uniform lookups are cached in std::map. No fps gain for me.