Sync'd branch integration/inbound with upstream @ Sat Oct  4 22:08:41 PDT 2014