Sync'd branch integration/inbound with upstream @ Sat Oct  4 19:25:40 PDT 2014