Merge branch 'release' into PCT-671_explain_support

Conflicts:
	Godeps.json