Merge branch 'develop' into fix_crash_in_android_2
authormasensio <masensio@solidgear.es>
Fri, 13 Mar 2015 09:12:27 +0000 (10:12 +0100)
committermasensio <masensio@solidgear.es>
Fri, 13 Mar 2015 09:12:27 +0000 (10:12 +0100)

Trivial merge