Sync'd branch integration/fx-team with upstream @ Mon Sep 22 16:28:41 PDT 2014