Merge tag 'v1.0.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 22 Jun 2016 12:42:41 +0000 (08:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 22 Jun 2016 12:42:41 +0000 (08:42 -0400)
v1.0.14


Trivial merge