Sync'd branch integration/fx-team with upstream @ Sat Nov  1 06:48:16 PDT 2014