Sync'd branch integration/inbound with upstream @ Tue Oct  7 14:07:37 PDT 2014