Sync'd branch integration/inbound with upstream @ Tue Oct  7 18:21:39 PDT 2014