Sync'd branch integration/inbound with upstream @ Tue Nov 11 21:02:57 PST 2014