merge master changes to doctrine branch