Mi indexing
 - [x] closes #15424
 - [x] closes #15434
 - [x] tests added / passed
 - [x] passes ``git diff upstream/master | flake8 --diff``
 - [x] whatsnew entry

This also fixes indexing with a ``DataFrame``, which was actually not mentioned in #15424 (but it's a twoliner)