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