ENH: make Series work with map objects the same way as generators
Merge branch 'master' of https://github.com/mcsalgado/pandas into mcsalgado-master
Merge branch 'mcsalgado-master'

Conflicts:
	doc/source/whatsnew/v0.15.2.txt