Sync'd branch integration/fx-team with upstream @ Mon Sep 15 07:09:34 PDT 2014