Merge branch 'master' into dev
authorZhiyi Sun <zhiyisun@users.noreply.github.com>
Thu, 8 Dec 2016 00:57:14 +0000 (08:57 +0800)
committerGitHub <noreply@github.com>
Thu, 8 Dec 2016 00:57:14 +0000 (08:57 +0800)
commitb42b654304a338c8ee634d797a716c8dae56013f
tree00d7b605e3b789331eed4c88f6bdb9f7d1bd1611
parent33343b07f91dd5306508a5ad4cdeacb6f9fe0eeb
parent1bf24a29a55bb1ffc1d987169b14de656bce295f
Merge branch 'master' into dev