Merge branch 'master' into davidsBranch
poop poop poop
More GK
changes
Merge branch 'davidsBranch'