Merge branch 'develop' into check_server_version
authormasensio <masensio@solidgear.es>
Fri, 28 Mar 2014 09:39:08 +0000 (10:39 +0100)
committermasensio <masensio@solidgear.es>
Fri, 28 Mar 2014 09:39:08 +0000 (10:39 +0100)

Trivial merge