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