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