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