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