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