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