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