Merge branch 'master' of http://git.roojs.com/Pman.Core
authorbenny <benny@roojs.com>
Tue, 18 Sep 2018 06:28:39 +0000 (14:28 +0800)
committerbenny <benny@roojs.com>
Tue, 18 Sep 2018 06:28:39 +0000 (14:28 +0800)

Trivial merge