Sync'd branch integration/fx-team with upstream @ Mon Sep  1 12:53:32 PDT 2014