Sync'd branch integration/fx-team with upstream @ Mon Sep 15 12:32:37 PDT 2014