Sync'd branch projects/elm with upstream @ Mon Sep 22 22:29:01 PDT 2014