Merge tag 'v2.9.3' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Jan 2017 13:56:51 +0000 (08:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 24 Jan 2017 13:56:51 +0000 (08:56 -0500)
Version 2.9.3


Trivial merge