Merge branch 'develop' into videoInstandUploads
authormasensio <masensio@solidgear.es>
Wed, 9 Apr 2014 06:42:30 +0000 (08:42 +0200)
committermasensio <masensio@solidgear.es>
Wed, 9 Apr 2014 06:42:30 +0000 (08:42 +0200)

Trivial merge