Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:29:01 +0000 (09:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:29:01 +0000 (09:29 -0400)
v1.1.4


Trivial merge