Merge branch 'hotfix/1.6.2' v1.6.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 17:37:34 +0000 (12:37 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 10 Jan 2017 17:37:34 +0000 (12:37 -0500)

Trivial merge