Sync'd branch projects/elm with upstream @ Fri Aug 29 02:34:57 PDT 2014