Sync'd branch integration/fx-team with upstream @ Tue Oct 14 18:32:41 PDT 2014