Sync'd branch integration/fx-team with upstream @ Mon Sep 29 02:23:42 PDT 2014