Actually resync 0.10 into master#1022
Merged
peternewman merged 5 commits intoOpenLightingProject:masterfrom Jan 28, 2016
Merged
Actually resync 0.10 into master#1022peternewman merged 5 commits intoOpenLightingProject:masterfrom
peternewman merged 5 commits intoOpenLightingProject:masterfrom