Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 27 May 2016 13:10:55 +0000 (09:10 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 27 May 2016 13:10:55 +0000 (09:10 -0400)
v1.1.4


Trivial merge