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