Use trigger_error() to flag features as deprecated
Delete tests for deprecated assertions
Merge branch '4.2'