Fixed handling both numpy.unique1d and numpy.unique
Merge branch 'master' into develop