Merge branch 'release/1.4.7' v1.4.7
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 3 May 2016 18:26:06 +0000 (14:26 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 3 May 2016 18:26:06 +0000 (14:26 -0400)

Trivial merge