Split NSNumber tests to work around a simulator runtime bug
Merge remote-tracking branch 'origin/master'