merge of cc7d47b52fc39dc6940ea8fff5b782fbd44a2f6c
     and f697d6be3bdf1a59bfd78dc1239ea417d52904a7

--HG--
extra : convert_revision : b1cb6d6bba496c942d1850d0f6ca5d71c0deaf1f