Merge branch 'release/2.1' v2.1
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 13:30:06 +0000 (09:30 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 15 Jun 2016 13:30:06 +0000 (09:30 -0400)

Trivial merge