Sync'd branch integration/fx-team with upstream @ Mon Sep  8 13:00:36 PDT 2014