Merge tag 'v1.0.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 15:08:11 +0000 (10:08 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 15:08:11 +0000 (10:08 -0500)
v1.0.14


Trivial merge