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