Sync'd branch integration/fx-team with upstream @ Fri Sep 19 04:58:39 PDT 2014