merging master to doctrine branch