Sync'd branch integration/inbound with upstream @ Mon Nov 10 18:27:54 PST 2014