Sync'd branch integration/inbound with upstream @ Wed Nov 12 00:21:59 PST 2014