Merge tag 'v1.4.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Nov 2015 15:39:58 +0000 (10:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 19 Nov 2015 15:39:58 +0000 (10:39 -0500)
Version 1.4.0


Trivial merge