Sync'd branch integration/fx-team with upstream @ Tue Oct 14 17:43:45 PDT 2014