Cleaned up Output API.
Fixed compile error on Linux.
Merge branch 'develop' into feature/Lighting