Sync'd branch integration/fx-team with upstream @ Tue Oct 21 20:46:45 PDT 2014