Sync'd branch integration/fx-team with upstream @ Fri Sep 19 08:26:52 PDT 2014