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