Merge remote-tracking branch 'origin/Applications/17.04'

Authored by dfaure on Apr 8 2017, 12:39 PM.

Description

Merge remote-tracking branch 'origin/Applications/17.04'

Merged Changes

CommitAuthorDetailsCommitted
7be68f22ac3bD5349dfaure
Don't get hit forever by an old setting from baloorc when hand-editing the… 
Apr 8 2017