Cleaning up code.
Merge branch '4.2'
Working on method injection.
HttpResponseException in routing layer.