Merging updates to the zf2 branch back into master