1.0.0-dev-20140602 (upstream 170f395)