Sync'd branch integration/fx-team with upstream @ Sat Aug 30 18:28:34 PDT 2014