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