Fix #686. Merge branch 'ashwinyes-develop' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 10 Nov 2015 20:30:26 +0000 (04:30 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 10 Nov 2015 20:30:26 +0000 (04:30 +0800)

Trivial merge