Merge branch 'hotfix/1.0.16' v1.0.16
authorAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:30:33 +0000 (17:30 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Fri, 8 Jan 2016 22:30:33 +0000 (17:30 -0500)

Trivial merge