Combining npm branch with master (the safe way). See change log for more details.