Merge branch 'develop' into add_cookie_based_session_support
authormasensio <masensio@solidgear.es>
Fri, 6 Jun 2014 11:37:24 +0000 (13:37 +0200)
committermasensio <masensio@solidgear.es>
Fri, 6 Jun 2014 11:37:24 +0000 (13:37 +0200)

Trivial merge