Sync'd branch integration/fx-team with upstream @ Fri Aug 29 00:03:36 PDT 2014