Sync'd branch integration/fx-team with upstream @ Thu Oct  9 23:56:40 PDT 2014