Merge branch 'release/1.1.14' v1.1.14
authorLaury GvR <laury@gaslightmedia.com>
Fri, 21 Apr 2017 20:46:35 +0000 (16:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 21 Apr 2017 20:46:35 +0000 (16:46 -0400)

Trivial merge