Merge branch 'master' into noglib2

This commit is contained in:
Nguyen Anh Quynh 2016-12-28 13:49:21 +08:00
commit 88fa2f5d4c

Diff content is not available