Sync'd branch integration/fx-team with upstream @ Mon Aug 25 13:28:21 PDT 2014