Merging in changes from live code on Homer
Merge branch 'master' into kchbranch

Homer
Merge branch 'master' into kchbranch
Fix to first generic div1 bug
Now actually merging in live code changes
Merge branch 'master' into kchbranch