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