Sync'd branch projects/elm with upstream @ Sat Aug 23 01:03:58 PDT 2014