1.0.0-dev-20140805 (upstream 4ecdbf8)