repo name
Merge branch 'master' into patmoore-master
 better error message
Merge branch 'master' into patmoore-master
comments
explain text
remove annoying debugger lines