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