Sync'd branch integration/inbound with upstream @ Tue Oct  7 13:10:45 PDT 2014