Sync'd branch integration/fx-team with upstream @ Wed Oct  8 09:13:47 PDT 2014