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