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