0.1.3
Only create new err object if necessary
Merge branch 'master' into errorStack

Conflicts:
	package.json