Guestrepo Fixes
Created originally on Bitbucket by daninorr_sel (Daniel Norris)
Was already merged in Bitbucket before import, marked as merged by the import user
This set of changes should fix the following issues: 16, 19, 18, 15, 12, 10, 8, 6, 3,4