Sync'd branch projects/elm with upstream @ Tue Aug 26 22:05:59 PDT 2014