Sync'd branch projects/elm with upstream @ Tue Sep 23 15:03:01 PDT 2014