Sync'd branch integration/fx-team with upstream @ Fri Aug 22 17:49:36 PDT 2014