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