Merge tag 'v1.0.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:34:21 +0000 (16:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:34:21 +0000 (16:34 -0400)
v1.0.14


Trivial merge