Merge tag 'v1.0.11' into develop
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 4 Jan 2016 20:25:14 +0000 (15:25 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 4 Jan 2016 20:25:14 +0000 (15:25 -0500)
1.0.11


Trivial merge