Sync'd branch integration/inbound with upstream @ Tue Oct  7 18:51:43 PDT 2014