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