Imported Upstream version 5.4.10
Imported Upstream version 5.4.13