Sync'd branch integration/fx-team with upstream @ Tue Sep 23 17:43:40 PDT 2014