Merge tag 'v1.1.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 19:07:26 +0000 (14:07 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 2 Feb 2016 19:07:26 +0000 (14:07 -0500)
Version 1.1.4


Trivial merge