Sync'd branch integration/fx-team with upstream @ Mon Sep 29 11:34:40 PDT 2014