Sync'd branch integration/fx-team with upstream @ Fri Oct 10 10:33:37 PDT 2014