Sync'd branch integration/fx-team with upstream @ Mon Sep  1 10:16:34 PDT 2014