1.0.0-dev-20140616 (upstream ac497fe)