Berlin 2013: Merge 2 proposals into 1.