Merge remote-tracking branch 'origin/develop' into share_password_support
authormasensio <masensio@solidgear.es>
Tue, 10 Mar 2015 13:27:35 +0000 (14:27 +0100)
committermasensio <masensio@solidgear.es>
Tue, 10 Mar 2015 13:27:35 +0000 (14:27 +0100)

Trivial merge