Merge branch '03-ISNAN' into 14-misc-cleanup
Merge branch '03-ISNAN' into 14-misc-cleanup
fix error in doc for aperm (plus code cleanup)
Merge branch '14-misc-cleanup' into 15
fix to apply to maintain old behaviour with objects
Merge branch '14-misc-cleanup' into 15