Merge branch 'Applications/17.08'

Authored by kossebau on Oct 10 2017, 6:49 PM.