Merge branch 'master' into bezier_signature
authorjohn@roojs.com <john@roojs.com>
Fri, 28 Dec 2018 07:38:50 +0000 (15:38 +0800)
committerjohn@roojs.com <john@roojs.com>
Fri, 28 Dec 2018 07:38:50 +0000 (15:38 +0800)

Trivial merge