Sync'd branch integration/fx-team with upstream @ Mon Sep  8 06:33:36 PDT 2014