Sync'd branch integration/inbound with upstream @ Sat Oct 11 15:40:39 PDT 2014