Merge branch 'master' into map2014

Conflicts:
	lib/parser/ccda/shared.js