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