Merge branch 'r-1.0.5'

git-svn-id: https://plugins.svn.wordpress.org/master-slider/trunk@948941 b8457f37-d9ea-0310-8a92-e5e31aec5664