Merge branch 'release/2013-05-29-15-48'
Always tag new bookmarks
Merge branch 'hotfix/tag' into develop