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