Sync'd branch integration/fx-team with upstream @ Sat Sep 20 04:47:23 PDT 2014