Sync'd branch integration/fx-team with upstream @ Mon Sep 15 06:30:37 PDT 2014