Merge fixes.
Merge branch 'master' of https://github.com/dimmondslice/TeamPlaceholder
lighting work.