Sync'd branch integration/fx-team with upstream @ Tue Sep 23 03:36:39 PDT 2014