Sync'd branch integration/inbound with upstream @ Tue Oct 28 08:08:08 PDT 2014