Fixed #711, #698. Merge branch 'byzhang-develop' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 2 Feb 2016 18:56:27 +0000 (02:56 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 2 Feb 2016 18:56:27 +0000 (02:56 +0800)

Trivial merge