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