Sync'd branch integration/fx-team with upstream @ Mon Sep 29 04:28:17 PDT 2014