BUG: Bug in setting with ix/loc and a mixed int/string index (GH4544)
Merge pull request #5064 from jreback/ix_edge

BUG: Bug in setting with ix/loc and a mixed int/string index (GH4544)
CLN: clean up tslib.pyx a bit
CLN: skip on np < 1.7