Merge branch 'master' into development
Removed ribbon fix because wmode fixed z-index
Merge branch 'development'