Sync'd branch integration/fx-team with upstream @ Mon Sep 22 16:25:43 PDT 2014