sort of fixed, still sucks a chode, though
i am a silly goose
Merge branch 'master' into jqm