Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 30 Nov 2015 13:57:53 +0000 (08:57 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 30 Nov 2015 13:57:53 +0000 (08:57 -0500)
v1.1.4


Trivial merge