Sync'd branch integration/inbound with upstream @ Tue Oct 28 23:38:39 PDT 2014