attempt to fix #289
Merge branch 'git' into develop