Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
authormasensio <masensio@solidgear.es>
Mon, 23 Mar 2015 13:29:25 +0000 (14:29 +0100)
committermasensio <masensio@solidgear.es>
Mon, 23 Mar 2015 13:29:25 +0000 (14:29 +0100)

Trivial merge