Sync'd branch projects/elm with upstream @ Fri Sep  5 16:08:03 PDT 2014