Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:36:45 +0000 (16:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 27 Oct 2016 20:36:45 +0000 (16:36 -0400)
v1.1.4


Trivial merge