Merge tag 'v1.0.13' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 18:33:10 +0000 (13:33 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 18:33:10 +0000 (13:33 -0500)
v1.0.13


Trivial merge