Sync'd branch integration/fx-team with upstream @ Mon Sep 29 07:43:39 PDT 2014