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