Sync'd branch projects/elm with upstream @ Tue Oct 21 19:50:03 PDT 2014