Sync'd branch integration/fx-team with upstream @ Fri Oct 31 20:32:34 PDT 2014