Sync'd branch integration/fx-team with upstream @ Tue Sep 16 23:59:42 PDT 2014