Sync'd branch integration/fx-team with upstream @ Mon Sep 29 13:27:41 PDT 2014