Merge branch 'release/1.1.14' V1.1.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 30 Sep 2016 13:07:22 +0000 (09:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 30 Sep 2016 13:07:22 +0000 (09:07 -0400)

Trivial merge