Sync'd branch integration/fx-team with upstream @ Fri Oct 31 11:07:37 PDT 2014