Sync'd branch integration/fx-team with upstream @ Mon Sep 22 14:51:40 PDT 2014