Sync'd branch integration/fx-team with upstream @ Tue Oct 28 14:11:22 PDT 2014