Sync'd branch integration/inbound with upstream @ Sun Oct 12 00:38:42 PDT 2014