0.9.13
merge of 'be06d7987687efb0d6b027f04a2efbf702218677'
     and 'f6541fdc88966f2e0e510c2291b33cf716a3a62a'