Sync'd branch integration/fx-team with upstream @ Sun Aug 31 19:57:33 PDT 2014