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