Merge branch 'master' into t181
authorRussell Keith-Magee <russell@keith-magee.com>
Sun, 20 Dec 2015 16:37:37 +0000 (00:37 +0800)
committerRussell Keith-Magee <russell@keith-magee.com>
Sun, 20 Dec 2015 16:37:37 +0000 (00:37 +0800)

Trivial merge