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