Merge branch 'hotfix/1.6.3' v1.6.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Jan 2017 18:17:06 +0000 (13:17 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Jan 2017 18:17:06 +0000 (13:17 -0500)

Trivial merge