Merge branch 'hotfix-2.0.3'
Merge branch 'development'
Bug fix of inability to delete guides
Merge branch 'hotfix-2.0.4' into development