Sync'd branch integration/fx-team with upstream @ Fri Oct 31 17:16:55 PDT 2014