Merge branch 'master' of http://git.roojs.com/roojs1
authoredward <edward@roojs.com>
Tue, 28 Nov 2017 05:07:01 +0000 (13:07 +0800)
committeredward <edward@roojs.com>
Tue, 28 Nov 2017 05:07:01 +0000 (13:07 +0800)

Trivial merge