Sync'd branch integration/fx-team with upstream @ Fri Sep 19 16:23:14 PDT 2014