Merge branch 'dev' into gemtalk
(cherry picked from commit 14260c5042951cdf8eac804e6075194195827392)
Merge branch 'master' into gemtalk