Fixing minor bug with an assert without a non-braced if
Merge remote-tracking branch 'origin/devel-0.5' into devel-0.6