Merge branch 'release/2.9.2' v2.9.2
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 17:31:07 +0000 (12:31 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Jan 2017 17:31:07 +0000 (12:31 -0500)

Trivial merge