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