Merge branch 'develop' into add_cookie_based_session_support
authormasensio <masensio@solidgear.es>
Mon, 9 Jun 2014 09:48:07 +0000 (11:48 +0200)
committermasensio <masensio@solidgear.es>
Mon, 9 Jun 2014 09:48:07 +0000 (11:48 +0200)

Trivial merge