Sync'd branch integration/inbound with upstream @ Sun Oct  5 23:55:47 PDT 2014