Sync'd branch integration/fx-team with upstream @ Sat Oct 11 08:52:42 PDT 2014