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