Merge branch 'hotfix/20140707-opop'
gamebanana
Merge branch 'hotfix/20140707-gamebanana' into develop