ENH/BF: 0.4 it is
Merge remote-tracking branch 'origin/master'