Sync'd branch projects/elm with upstream @ Fri Oct  3 03:29:04 PDT 2014