Sync'd branch integration/fx-team with upstream @ Mon Sep  8 17:34:36 PDT 2014