Sync'd branch integration/fx-team with upstream @ Mon Sep 22 13:37:38 PDT 2014