Sync'd branch integration/fx-team with upstream @ Mon Sep 15 10:50:03 PDT 2014