Merge tag 'v2.9.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Jan 2017 15:03:37 +0000 (10:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Jan 2017 15:03:37 +0000 (10:03 -0500)
Version 2.9.4


Trivial merge