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