Merge tag 'v1.0.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jan 2016 16:08:05 +0000 (11:08 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 20 Jan 2016 16:08:05 +0000 (11:08 -0500)
v1.0.14


Trivial merge