Merge branch 'master' of http://git.roojs.com/Pman.Core
authoredward <edward@roojs.com>
Thu, 14 Jul 2016 05:33:48 +0000 (13:33 +0800)
committeredward <edward@roojs.com>
Thu, 14 Jul 2016 05:33:48 +0000 (13:33 +0800)

Trivial merge