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