Merge branch 'master' into develop
Options page not opening fixed.
Removed options
Merge branch 'develop'