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