Merge 'libertas/dev' into dev

Conflicts:
	divide.py
Merge branch 'libertas/dev' into dev

Conflicts:
	divide.py
Merge branch libertas/dev into dev

Conflicts:
	divide.py