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