Sync'd branch integration/fx-team with upstream @ Mon Sep 15 21:06:38 PDT 2014