Merge remote-tracking branch 'origin/4.7' into 5.0

Authored by mwolff.

Description

Merge remote-tracking branch 'origin/4.7' into 5.0

Details

Merged Changes

CommitAuthorDetailsCommitted
2f651e3e7f8bmwolff
Make compile, sorry...! 
Jan 21 2016