Sync'd branch integration/fx-team with upstream @ Mon Sep 22 05:42:37 PDT 2014