Merge branch 'release/2.1.0' v2.1.0
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Feb 2016 14:17:52 +0000 (09:17 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Feb 2016 14:17:52 +0000 (09:17 -0500)

Trivial merge