a
Merge branch 'master' of https://github.com/sunnychow/aftership-php

Conflicts:
	src/AfterShip/Core/Request.php