Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
authormasensio <masensio@solidgear.es>
Wed, 18 Mar 2015 08:20:02 +0000 (09:20 +0100)
committermasensio <masensio@solidgear.es>
Wed, 18 Mar 2015 08:20:02 +0000 (09:20 +0100)

Trivial merge