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

Trivial merge