Sync'd branch integration/inbound with upstream @ Tue Oct  7 09:03:40 PDT 2014