Merge tag 'v2.4.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Jan 2018 18:21:49 +0000 (13:21 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Jan 2018 18:21:49 +0000 (13:21 -0500)
Version 2.4.6


Trivial merge