Merge branch 'refs/heads/v09-26-13'

Conflicts:
	src/core/core.js
	src/core/evaluator.js
	src/core/fonts.js
	src/core/image.js
	src/core/obj.js
	src/display/api.js
	src/display/canvas.js