Merge 3 nov 2013