Merging changes from github

git-svn-id: https://plugins.svn.wordpress.org/frontend-uploader/trunk@795469 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merging 0.6 from github

git-svn-id: https://plugins.svn.wordpress.org/frontend-uploader/trunk@795487 b8457f37-d9ea-0310-8a92-e5e31aec5664