Sync'd branch integration/fx-team with upstream @ Mon Sep 29 05:52:43 PDT 2014