Checkin from JessiD
Merge branch 'master' of https://github.com/claylevering/bearded-octo-bugfixes