Sync'd branch integration/inbound with upstream @ Mon Nov 10 22:16:51 PST 2014