fix 1294
1294
Merge branch 'master' into develop