Sync'd branch integration/fx-team with upstream @ Fri Oct 17 08:15:44 PDT 2014