Sync'd branch integration/fx-team with upstream @ Mon Sep 15 09:44:39 PDT 2014