Merge branch 'Mario/flag_return_fixes'
authorMario <mario@smbclan.net>
Tue, 19 Jul 2016 14:23:41 +0000 (00:23 +1000)
committerMario <mario@smbclan.net>
Tue, 19 Jul 2016 14:23:41 +0000 (00:23 +1000)

Trivial merge