Merge tag 'v1.0.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:02:41 +0000 (14:02 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:02:41 +0000 (14:02 -0500)
v1.0.14


Trivial merge