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