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