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