Try to avoid losing Kevin's changes
Merge branch 'p5m' of github.com:jenniferliddle/p4 into p5m