Sync'd branch integration/fx-team with upstream @ Fri Oct 31 12:44:36 PDT 2014