Merge branch 'master' into forceparanoid

Conflicts:
	lib/dao-factory.js
	lib/dao.js