Sync'd branch integration/fx-team with upstream @ Fri Oct 10 19:24:52 PDT 2014