Merge tag 'v1.4.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:42:03 +0000 (14:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 1 Feb 2016 19:42:03 +0000 (14:42 -0500)
Version 1.4.2


Trivial merge