Merge tag 'v1.1.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Apr 2016 18:47:41 +0000 (14:47 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 25 Apr 2016 18:47:41 +0000 (14:47 -0400)
Version 1.1.4


Trivial merge