Sync'd branch integration/fx-team with upstream @ Mon Sep 29 06:36:33 PDT 2014