Fix bug 5846
Merge branch 'master' of https://github.com/MichaelWS/pandas into MichaelWS-master