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