Merge branch 'develop' into instant_uploads_set_path
authorjabarros <jabarros@solidgear.es>
Wed, 19 Nov 2014 17:40:06 +0000 (18:40 +0100)
committerjabarros <jabarros@solidgear.es>
Wed, 19 Nov 2014 17:40:06 +0000 (18:40 +0100)

Trivial merge