Sync'd branch integration/inbound with upstream @ Tue Oct 14 22:29:40 PDT 2014