Sync'd branch integration/inbound with upstream @ Sat Oct 25 17:39:43 PDT 2014