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