Sync'd branch integration/fx-team with upstream @ Mon Sep  1 17:13:31 PDT 2014