this refs #1 and should remove the NotFoundExceptions raised by the App::abort(304)
Merge remote-tracking branch 'origin/master'