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