Sync'd branch projects/elm with upstream @ Mon Sep 22 23:50:06 PDT 2014