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