* Manually merged in lp:~m4ktub/duplicity/0.6-reliability
  - Per fix proposed in Bug #1395341.