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