Sync'd branch integration/fx-team with upstream @ Mon Sep 22 07:40:40 PDT 2014