Sync'd branch integration/fx-team with upstream @ Mon Sep 22 17:38:39 PDT 2014