Merge branch 'master' into Mario/cts_checkpoint_speedup
authorMario <mario@smbclan.net>
Sat, 13 May 2017 03:41:42 +0000 (13:41 +1000)
committerMario <mario@smbclan.net>
Sat, 13 May 2017 03:41:42 +0000 (13:41 +1000)

Trivial merge