Sync'd branch integration/fx-team with upstream @ Mon Sep 29 06:40:44 PDT 2014