merge & changelog 2013-01-14: notifications