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