Sync'd branch integration/fx-team with upstream @ Mon Sep 22 22:46:39 PDT 2014