Imported Upstream version 0.54
Imported Upstream version 0.55