Datapath Step4
Merge remote-tracking branch 'origin/master'

Conflicts:
	doc/architecture/pt_br_architecture.pdf
	doc/architecture/pt_br_architecture.tex