Sync'd branch integration/fx-team with upstream @ Mon Sep 22 11:58:45 PDT 2014