Merge branch 'release/1.6.0' v1.6.0
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 9 Jan 2017 20:24:07 +0000 (15:24 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 9 Jan 2017 20:24:07 +0000 (15:24 -0500)

Trivial merge