Merge branch 'master' into development
Restore wrapper for fade in effect
Merge branch 'development'