Merge branch 'master' into PIM-1864

Conflicts:
	src/Pim/Bundle/DataGridBundle/Controller/DatagridViewController.php