Sync'd branch integration/fx-team with upstream @ Fri Sep 26 12:25:40 PDT 2014