Merge branch 'release/1.1.15' v1.1.15
authorChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 17:05:35 +0000 (13:05 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Tue, 30 Aug 2016 17:05:35 +0000 (13:05 -0400)

Trivial merge