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


Trivial merge