Sync'd branch integration/inbound with upstream @ Tue Oct  7 03:55:40 PDT 2014