Sync'd branch integration/fx-team with upstream @ Mon Sep 29 13:57:39 PDT 2014