Merge remote-tracking branch 'origin/5.0'

Authored by ltoscano on Aug 25 2016, 11:38 PM.

Description

Merge remote-tracking branch 'origin/5.0'

Merged Changes

CommitAuthorDetailsCommitted
6d6e95517f6altoscano
Enable translations for custom-definesandincludes 
Aug 25 2016
c53b8d551d75ltoscano
UI string: fix string puzzle 
Aug 25 2016
7314e99b3c3fkfunk
Update copyright year 
Aug 22 2016
f4b5b7538be6mwolff
Fix compile 
Aug 22 2016