Sync'd branch integration/fx-team with upstream @ Mon Sep 15 17:28:38 PDT 2014