Sync'd branch integration/fx-team with upstream @ Tue Oct  7 13:15:49 PDT 2014