Merge branch 'release/2.2.0' v2.2.0
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 22 Jul 2016 19:44:26 +0000 (15:44 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 22 Jul 2016 19:44:26 +0000 (15:44 -0400)

Trivial merge