Switched to log m as state
Merge remote-tracking branch 'origin/master'

Conflicts:
	approximate.py