Sync'd branch projects/elm with upstream @ Tue Oct  7 16:44:05 PDT 2014