Merge tag 'v1.1.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:49:06 +0000 (11:49 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 19 Jun 2015 15:49:06 +0000 (11:49 -0400)
v1.1.14


Trivial merge