[MRG+1] Fix np1.9

Some numpy 1.9 stuff I had forgotten to push :(.

Sorry working while traveling has side effects.