Merge branch 'master' into hipe

Conflicts:
	src/jsone_encode.erl