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