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