Sync'd branch integration/fx-team with upstream @ Tue Oct  7 14:23:50 PDT 2014