Sync'd branch projects/elm with upstream @ Tue Sep 30 22:12:02 PDT 2014