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