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