Sync'd branch integration/fx-team with upstream @ Mon Sep 29 18:42:44 PDT 2014