Sync'd branch integration/inbound with upstream @ Tue Nov 11 00:28:56 PST 2014