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