Merge branch 'v1.6'

Conflicts:
	action.php
Merge branch 'master' of https://github.com/ldleman/Leed

Conflicts:
	action.php