Merge branch 'master' of http://git.roojs.com/roojs1
authoredward <edward@roojs.com>
Wed, 22 Nov 2017 04:26:45 +0000 (12:26 +0800)
committeredward <edward@roojs.com>
Wed, 22 Nov 2017 04:26:45 +0000 (12:26 +0800)

Trivial merge