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