Imported Upstream version 1.6.0~20140516~eaa616