Sync'd branch integration/fx-team with upstream @ Mon Sep  8 07:38:35 PDT 2014