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