Merge tag 'v1.1.4' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:13:40 +0000 (09:13 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:13:40 +0000 (09:13 -0500)
v1.1.4


Trivial merge