Sync'd branch integration/inbound with upstream @ Sat Oct 18 10:19:47 PDT 2014