Sync'd branch integration/inbound with upstream @ Sat Oct 25 04:10:44 PDT 2014