Merge branch 'master', remote-tracking branch 'origin'
fixed a couple of problems raised by trying to run nosetests.