Sync'd branch integration/fx-team with upstream @ Mon Sep 22 12:57:46 PDT 2014