Merge tag 'v1.1.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 21 Apr 2017 20:46:40 +0000 (16:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 21 Apr 2017 20:46:40 +0000 (16:46 -0400)
v1.1.14


Trivial merge