Sync'd branch integration/fx-team with upstream @ Fri Oct 17 11:34:45 PDT 2014