Sync'd branch integration/fx-team with upstream @ Mon Sep 22 03:04:38 PDT 2014