Merge branch 'release/1.0.16' v1.0.16
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 21:16:09 +0000 (16:16 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Feb 2016 21:16:09 +0000 (16:16 -0500)

Trivial merge