Sync'd branch integration/fx-team with upstream @ Mon Sep 22 09:23:41 PDT 2014