Merge branch 'develop'
Fix double close
Merge branch 'master' into develop