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