Sync'd branch projects/elm with upstream @ Thu Sep 25 15:11:06 PDT 2014