Merge tag 'v1.4.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 18:58:30 +0000 (14:58 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 22 Apr 2015 18:58:30 +0000 (14:58 -0400)
Version 1.4.2


Trivial merge