Merge tag 'v1.2.10' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:00:32 +0000 (13:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 19 Nov 2015 18:00:32 +0000 (13:00 -0500)
v1.2.10


Trivial merge