Merge tag 'v1.4.0' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 19:51:51 +0000 (15:51 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 19:51:51 +0000 (15:51 -0400)
Version 1.4.0


Trivial merge