Sync'd branch projects/elm with upstream @ Mon Sep 29 17:47:04 PDT 2014