Sync'd branch integration/fx-team with upstream @ Fri Oct  3 14:43:35 PDT 2014