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