Sync'd branch integration/fx-team with upstream @ Mon Sep 15 15:41:34 PDT 2014