Lower-level output API
Version 0.12.16
Merge branch 'v0.12' into v13

Conflicts:
	lib/controller/base_controller.js
	package.json