Merge branch 'Applications/17.08'

Authored by shentey on Aug 17 2017, 6:33 PM.

Description

Merge branch 'Applications/17.08'

Merged Changes

CommitAuthorDetailsCommitted
758ebe8b2d72shentey
fix bug introduced in b5d1987f74814ccdd7560a79eff2ae35f4631464 
Aug 17 2017