Sync'd branch integration/fx-team with upstream @ Mon Sep 15 08:20:41 PDT 2014