Revert accidental merges into master
Merge branch 'develop'

Conflicts:
	moment-timezone.js
	tests/manipulate.js
Properly bump version in moment-timezone.js