Merge tag 'v1.2.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:28:02 +0000 (12:28 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 13 Sep 2016 16:28:02 +0000 (12:28 -0400)
v1.2.5


Trivial merge