Sync'd branch integration/fx-team with upstream @ Mon Sep 22 14:44:44 PDT 2014