Sync'd branch integration/fx-team with upstream @ Tue Sep 16 21:55:38 PDT 2014