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