Merge forward (master => doctrine)

There were a bunch of weird conflicts (eg Civi/*php deleted in master branch), but I think this handles it properly.