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