merge with 'upstream' of 13-3-2014