Sync'd branch projects/elm with upstream @ Tue Oct 14 22:54:03 PDT 2014