Merge Cleanup Paul-Perceptual-Incomplete -> master

I like how this has to be a commit to clear up the result of merge gone
shell.