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