Merge branch 'release/1.1.14' v1.1.14
authorLaury GvR <laury@gaslightmedia.com>
Mon, 22 Aug 2016 16:34:45 +0000 (12:34 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 22 Aug 2016 16:34:45 +0000 (12:34 -0400)

Trivial merge