Imported Upstream version 1.0-163-g833b993