Merge branch 'r3' to master 95/3495/1
authorWukong <rebirthmonkey@gmail.com>
Wed, 18 Nov 2015 20:39:13 +0000 (21:39 +0100)
committerWukong <rebirthmonkey@gmail.com>
Wed, 18 Nov 2015 20:39:13 +0000 (21:39 +0100)

Trivial merge