Sync'd branch integration/fx-team with upstream @ Thu Oct  9 16:27:48 PDT 2014