Merge branch 'master' of http://git.roojs.com/roojs1
authorjohn <john@roojs.com>
Mon, 20 Nov 2017 10:29:26 +0000 (18:29 +0800)
committerjohn <john@roojs.com>
Mon, 20 Nov 2017 10:29:26 +0000 (18:29 +0800)

Trivial merge