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