Sync'd branch integration/fx-team with upstream @ Fri Sep 12 11:50:43 PDT 2014