Merge conflict
Merge branch 'master' of https://github.com/aunn/db-api

Conflicts:
	AccessLogAPI.php
	AccessLogAPITest.php