Merge branch 'master' of https://github.com/mcsalgado/pandas
Merge branch 'master' of https://github.com/mcsalgado/pandas