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