Merge branch 'jeromerobert-bug736' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 12 Jan 2016 22:25:08 +0000 (22:25 +0000)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 12 Jan 2016 22:25:08 +0000 (22:25 +0000)

Trivial merge