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)
commit0e68beb89f16534d08ea825aef89bed962086dda
tree71034da4809e91134ddd02c519e443897b063686
parent9f080c47e1f451a83f8c58e986dcfdd9f8c5f99d
parent926ba8b7ca075d4d097398d749cc25b6022533cf
Fixed #711, #698. Merge branch 'byzhang-develop' into develop