Sync'd branch integration/fx-team with upstream @ Mon Sep 29 20:42:43 PDT 2014