Sync'd branch integration/fx-team with upstream @ Tue Sep 23 06:55:37 PDT 2014