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