added links/refs
Merge commit 'b8cc6467f58fd56f8599a4650b16e08dfcf14be6' into 2014-11-06-Zurich