Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:46:13 +0000 (12:46 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 8 Aug 2016 16:46:13 +0000 (12:46 -0400)
v1.1.4


Trivial merge