Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
authormasensio <masensio@solidgear.es>
Tue, 24 Mar 2015 11:26:24 +0000 (12:26 +0100)
committermasensio <masensio@solidgear.es>
Tue, 24 Mar 2015 11:26:24 +0000 (12:26 +0100)

Trivial merge