Merge tag 'v1.1.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Aug 2016 16:34:49 +0000 (12:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Aug 2016 16:34:49 +0000 (12:34 -0400)
v1.1.14


Trivial merge