Merge tag 'v1.0.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 21 Feb 2017 20:24:23 +0000 (15:24 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 21 Feb 2017 20:24:23 +0000 (15:24 -0500)
v1.0.14


Trivial merge