Sync'd branch integration/fx-team with upstream @ Fri Sep 12 19:48:38 PDT 2014