Merge tag 'v1.1.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 13:08:52 +0000 (09:08 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 13:08:52 +0000 (09:08 -0400)
v1.1.14


Trivial merge