Sync'd branch integration/fx-team with upstream @ Wed Oct  8 17:49:56 PDT 2014