Sync'd branch integration/fx-team with upstream @ Fri Aug 29 17:06:35 PDT 2014