Merge remote-tracking branch 'origin/multiindex_at_fix' into multiindex_at_fix

# Conflicts:
#	pandas/tests/indexing/test_scalar.py

Author: rhshadrach

pandas/tests/indexing/test_scalar.py

@@ -335,4 +335,3 @@ def test_multiindex_series_at_set():
     assert series.at[1, 3] == 3
     series.loc[1, 3] = 4
     assert series.loc[1, 3] == 4
-